body {
<<<<<<< .mine
	font-family: arial;
	background-color: #eee;
	color: #333;
=======
  font-family: arial;
  background-color: #eee;
  color: #333;
>>>>>>> .r15
}
h1 {
<<<<<<< .mine
	margin: 10px 20px 10px 20px;
=======
  margin: 10px 20px 10px 20px;
>>>>>>> .r15
}
h2 {
	margin: 0;
	font-size: 1.2em;
}
#tudo {
	position: absolute;
	background-color: white;
	margin: 20px 0 20px -390px;
	width: 760px;
	left: 50%;
	border: 10px solid #aaa;
}
#topo {
	font-size: 3em;
	margin: 20px;
}
#topo #foto {
	float: right;
	background-image: url(/media/foto.jpg);
	background-repeat: no-repeat;
	background-position: -20px -30px;
	width: 56px;
	height: 56px;
	border: 1px solid #47a;
}
.corpo {
	margin: 20px 20px 0 20px;
}
.rodape {
	clear: both;
	overflow: hidden;
	background-color: #89a;
	margin: 20px;
	font-size: 0.8em;
	color: white;
	padding: 10px;
	text-align: center;
}
.rodape a {
	color: white;
}
#menu {
	clear: both;
	overflow: hidden;
	background-color: #47a;
	margin-top: 10px;
	height: 26px;
	font-size: 0.8em;
	font-weight: bold;
	color: white;
}
#menu ul {
	margin: 0;
	padding: 0;
}
#menu ul li {
	float: left;
	list-style: none;
	padding: 5px;
}
#menu ul li a:link, #menu ul li a:visited, #menu ul li a:active {
	padding: 5px;
	text-decoration: none;
	color: white;
}
#menu ul li a:hover {
	background-color: #79b;
	color: white;
}
.artigo h2 {
	text-decoration: underline;
}
.artigo {
	margin: 10px 0 10px 0;
}
.artigo a {
	color: black;
}
.conteudo {
	padding: 10px;
}
form label {
	display: block;
}
textarea {
	height: 100px;
}
th {
	text-align: right;
	padding-right: 5px;
}
/* Comentarios */
.comentarios {
	border-top: 1px solid silver;
	margin-top: 20px;
}
.comentarios hr {
	border-width: 0;
	height: 1px;
	border-top: 1px solid #ddd;
}
body {
	font-family: arial;
	background-color: #eee;
	color: #333;
}
h1 {
	margin: 10px 20px 10px 20px;
}
h2 {
	margin: 0;
	font-size: 1.2em;
}
/* Layout */
#tudo {
	position: absolute;
	background-color: white;
	margin: 20px 0 20px -390px;
	width: 760px;
	left: 50%;
	border: 10px solid #aaa;
}
#topo {
	font-size: 3em;
	margin: 20px;
}
#topo #foto {
	float: right;
	background-image: url(/public/alatazan.jpg);
	background-repeat: no-repeat;
	background-position: -20px -30px;
	width: 56px;
	height: 56px;
	border: 1px solid #47a;
}
.corpo {
	margin: 20px 20px 0 20px;
}
.rodape {
	clear: both;
	overflow: hidden;
	background-color: #89a;
	margin: 20px;
	font-size: 0.8em;
	color: white;
	padding: 10px;
	text-align: center;
}
.rodape a {
  color: white;
}
/* Menu principal */
#menu {
  clear: both;
  overflow: hidden;
  background-color: #47a;
  margin-top: 10px;
  height: 26px;
  font-size: 0.8em;
  font-weight: bold;
  color: white;
}
#menu ul {
  margin: 0;
<<<<<<< .mine
  padding: 0;
}
#menu ul li {
  float: left;
  list-style: none;
  padding: 5px;
=======
>>>>>>> .r15
}
<<<<<<< .mine
#menu ul li a:link, #menu ul li a:visited, #menu ul li a:active {
  padding: 5px;
  text-decoration: none;
  color: white;
}
#menu ul li a:hover {
  background-color: #79b;
  color: white;
}
/* Artigo do blog */
.artigo h2 {
  text-decoration: underline;
}
.artigo {
  margin: 10px 0 10px 0;
}
.artigo a {
=======
#tudo {
  position: absolute;
  background-color: white;
>>>>>>> .r15
  margin: 20px 0 20px -390px;
  width: 760px;
  left: 50%;
  border: 10px solid #aaa;
}
#topo {
  font-size: 3em;
  margin: 20px;
}
#topo #foto {
  float: right;
  background-image: url(/public/alatazan.jpg);
  background-repeat: no-repeat;
  background-position: -20px -30px;
  width: 56px;
  height: 56px;
  border: 1px solid #47a;
}
.corpo {
  margin: 20px 20px 0 20px;
}
.rodape {
  clear: both;
  overflow: hidden;
  background-color: #89a;
  margin: 20px;
  font-size: 0.8em;
  color: white;
  padding: 10px;
  text-align: center;
}
<<<<<<< .mine
/* Formularios */
=======
.rodape a {
  color: white;
}
#menu {
  clear: both;
  overflow: hidden;
  background-color: #47a;
  margin-top: 10px;
  height: 26px;
  font-size: 0.8em;
  font-weight: bold;
  color: white;
}
#menu ul {
  margin: 0;
  padding: 0;
}
#menu ul li {
	float: left;
  list-style: none;
  padding: 5px;
}
#menu ul li a:link, #menu ul li a:visited, #menu ul li a:active {
  padding: 5px;
  text-decoration: none;
  color: white;
}
#menu ul li a:hover {
  background-color: #79b;
  color: white;
}
.artigo h2 {
  text-decoration: underline;
}
.artigo {
  margin: 10px 0 10px 0;
}
.artigo a {
  color: black;
}
.conteudo {
  padding: 10px;
}
>>>>>>> .r15
form label {
  display: block;
}
textarea {
  height: 100px;
}
th {
  text-align: right;
  padding-right: 5px;
}
/* Comentarios */
.comentarios {
  border-top: 1px solid silver;
  margin-top: 20px;
}
.comentarios hr {
  border-width: 0;
  height: 1px;
  border-top: 1px solid #ddd;
}